Skip to content

Conversation

jdonszelmann
Copy link
Contributor

@jdonszelmann jdonszelmann commented Jun 14, 2025

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 14, 2025
@jdonszelmann jdonszelmann force-pushed the naked branch 2 times, most recently from 48b6d12 to 78a8771 Compare June 19, 2025 08:03
@rust-log-analyzer

This comment has been minimized.

@jdonszelmann
Copy link
Contributor Author

cc: @folkertdev this might interest you

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Jun 20, 2025

☔ The latest upstream changes (presumably #142795) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 20, 2025
@jdonszelmann jdonszelmann marked this pull request as ready for review June 21, 2025 09:17
@rustbot
Copy link
Collaborator

rustbot commented Jun 21, 2025

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2025
@jdonszelmann
Copy link
Contributor Author

@rustbot ready

@bors
Copy link
Collaborator

bors commented Jun 22, 2025

☔ The latest upstream changes (presumably #142878) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with starts_with adjusted

@jdonszelmann
Copy link
Contributor Author

rebasd on master @bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jun 23, 2025

📌 Commit 5c0a625 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 23, 2025
@jdonszelmann
Copy link
Contributor Author

@bors rollup=iffy

jdonszelmann added a commit to jdonszelmann/rust that referenced this pull request Jun 23, 2025
rework `#[naked]` attribute parser

r? `@oli-obk`
bors added a commit that referenced this pull request Jun 23, 2025
Rollup of 5 pull requests

Successful merges:

 - #142493 (rework `#[naked]` attribute parser)
 - #142636 (bootstrap.example.toml: use less contextual format)
 - #142822 (Make `PartialEq` a `const_trait`)
 - #142892 (Fix ICE on debug builds where lints are delayed on the crate root)
 - #142904 (notify me when rdg is touched)

Failed merges:

 - #142827 (Move error code explanation removal check into tidy)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b44d0c7 into rust-lang:master Jun 23, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 23, 2025
rust-timer added a commit that referenced this pull request Jun 23, 2025
Rollup merge of #142493 - jdonszelmann:naked, r=oli-obk

rework `#[naked]` attribute parser

r? ``@oli-obk``
@cuviper cuviper modified the milestones: 1.89.0, 1.90.0 Jun 23, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 25, 2025
Port `#[track_caller]` to the new attribute system

r? `@oli-obk`

depends on rust-lang#142493

Closes rust-lang#142783

(didn't add a test for this, this situation should simply never come up again, the code was simply wrong. lmk if I should add it, but it won't test something very useful)
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 25, 2025
Port `#[track_caller]` to the new attribute system

r? ``@oli-obk``

depends on rust-lang#142493

Closes rust-lang#142783

(didn't add a test for this, this situation should simply never come up again, the code was simply wrong. lmk if I should add it, but it won't test something very useful)
rust-timer added a commit that referenced this pull request Jun 25, 2025
Rollup merge of #142825 - jdonszelmann:track-caller, r=oli-obk

Port `#[track_caller]` to the new attribute system

r? ``@oli-obk``

depends on #142493

Closes #142783

(didn't add a test for this, this situation should simply never come up again, the code was simply wrong. lmk if I should add it, but it won't test something very useful)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants